From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 20 Aug 2009 15:24:44 +0000 (+0000)
Subject: * net/dbus.el (top): Don't check for (getenv
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11000
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d044e8378ebeba7f93607e0e334b8f59ff3c1cd5;p=emacs.git

* net/dbus.el (top): Don't check for (getenv
"DBUS_SESSION_BUS_ADDRESS").  It's done in dbusbind.c now.
---

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 273d531ed35..aeff93f6d26 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -836,9 +836,8 @@ name of the property, and its value.  If there are no properties,
 ;; descriptors to input_wait_mask, in order to detect incoming
 ;; messages immediately.
 (dbus-ignore-errors
-  (when (getenv "DBUS_SESSION_BUS_ADDRESS")
-    (dbus-init-bus :system)
-    (dbus-init-bus :session)))
+ (dbus-init-bus :system)
+ (dbus-init-bus :session))
 
 (provide 'dbus)